Merge.

diff --cc linux-2.6.11-xen-sparse/arch/xen/i386/kernel/irq.c
index f31697ecb15df55653b2e1277c4d086e1309df74,f31697ecb15df55653b2e1277c4d086e1309df74..3565536d6cebfab467316c90cc0e226045a6d0ae
--- 1/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/irq.c
--- 2/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/irq.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/irq.c
@@@ -274,7 -274,7 +274,7 @@@ void fixup_irqs(cpumask_t map
                }
                if (irq_desc[irq].handler->set_affinity)
                        irq_desc[irq].handler->set_affinity(irq, mask);
--              else if (irq_desc[irq].action && !(warned++))
++              else if (irq_desc[irq].action)
                        printk("Cannot set affinity for irq %i\n", irq);
        }
  

diff --cc xen/common/event_channel.c
Simple merge